Sync'd branch releases/beta with upstream @ Mon Aug 25 11:41:28 PDT 2014