Sync from OctoFalcon:master on September 1, 2014