virtual-world-framework/vwf — pull request #294 by BrettASwift (2014-08-05 17:09:18+00:00)
Title: Branch/mars improvements

Adding in #291 and #293 to staging.

@kadst43