Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141015-1' into staging