Merge branch 'dev' of github.com:stschiff/msmc into dev
Merge branch 'dev'