Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170131-2' into staging