Merge develop into master for 1.0.2 release