Merge remote-tracking branch 'fluffyfreak/FixVS2012Renames'
Merge branch 'master' of github.com:fluffyfreak/pioneer into new4BaySpaceStation