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