https://www.pivotaltracker.com/story/show/48698701
Merge branch 'dev_sort_order_48698701' into develop