virtual-world-framework/mars-game — pull request #424 by kadst43 (2014-09-10 16:27:54+00:00)
Title: Merge up

@BrettASwift Can you merge up to master if it's safe (and let Mark know when you do)?