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