NoRef GIT-ONLY: Merge remote-tracking branch 'svn/trunk'
NoRef GIT-ONLY: Merge remote-tracking branch 'svn/trunk'

ilscipio/scipio-erp,ilscipio/scipio-erp,ilscipio/scipio-erp,ilscipio/scipio-erp,ilscipio/scipio-erp