Sync'd branch releases/beta with upstream @ Mon Aug 25 19:25:07 PDT 2014