Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150623-1' into staging