Merge remote-tracking branch 'remotes/famz/tags/pull-docker-20160601' into staging