Checkpoint commit
Derpfix :(
Merge branch 'sprint'