jay-lau/magnum — pull request #1 by jay-lau (2014-12-07 09:30:26+00:00)
Title: Sync up with magnum master

Sync up with magnum master