Sync with upstream development
Merge remote-tracking branch 'origin/1.5-develop' into 1.5-develop
Merge pull request #11 from betweenbrain/1.5-develop

1.5 develop