vs 2012
Merge branch 'master' into Solution