Sync'd branch releases/beta with upstream @ Thu Sep 11 21:00:31 PDT 2014