GPII/universal — pull request #182 by michelled (2014-01-09 22:25:28+00:00)
Title: GPII-363

Resolved the conflict in this pull request: https://github.com/GPII/universal/pull/177