Sync'd branch releases/beta with upstream @ Mon Aug 25 15:12:57 PDT 2014