heh.
Merge remote-tracking branch 'origin/stage'