Merge develop to master for 1.13.0 release.