Sync'd branch releases/beta with upstream @ Thu Sep 18 09:15:30 PDT 2014