Shopify/opensrs — pull request #2 by fw42 (2014-02-16 21:13:16+00:00)
Title: Pull upstream master

merge upstream master (voxxit/opensrs)