Sync'd branch releases/beta with upstream @ Thu Sep 11 13:36:43 PDT 2014