Paul-sm/no-OS — pull request #1 by Paul-sm (2014-04-02 14:56:22+00:00)
Title: CatchUp 2/4/14

Catch up changes on upstream repo