Merge commit 'b19c0041914019e6d9d96fce67ec0e7a6820bf3c' into tgunn-mncvtdev-to-master-2015-12-04