Commit 9830fbba05ef66325f929a09407abc45ab85847d

joshaber 2015-07-22T11:33:18

Merge branch 'master' into fix-init-ordering