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

41eb519c0d8795e.