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