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