Sync'd branch releases/beta with upstream @ Thu Sep 18 10:35:49 PDT 2014