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