sync'ed with master
Merge remote-tracking branch 'origin/1.0.0-dev' into ticket-103-clean