Home as Up simplification (thanks @chrisbanes)
Merge remote-tracking branch 'origin/master'