Another change that was overwritten. Dammit carl, Y U BREAK MY COMMITS??
Merge branch 'develop' of https://github.com/ytechie/msdevshow into develop