Merge develop into master for 1.0 RC release