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