Sync'd branch releases/beta with upstream @ Mon Oct 27 14:44:43 PDT 2014