Development version 0.1.0 (see development-changelog.txt for details).
Merge origin/master