Sync'd branch releases/beta with upstream @ Thu Sep 25 09:27:31 PDT 2014