Merged pre-master into master, new version is 0.9.2