Merge branch 'release/0.1.5'
Merge branch 'master' into feature/support_nsdata

* master: