Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20160621-1' into staging