Merge develop into master for v0.8.12b