pre-merging with nightly develop
Merge branch 'develop' of https://github.com/askcs/oneline into develop