Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20151103-1' into staging