Sync'd branch releases/beta with upstream @ Thu Sep  4 06:02:38 PDT 2014