Merge develop branch into master for 1.4.1 release