Sync'd branch releases/beta with upstream @ Thu Sep 18 07:50:05 PDT 2014