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