Merge into Master Dec2014

Merge develop branch into master for December 2014 release