Sync'd branch releases/beta with upstream @ Mon Oct 27 13:57:55 PDT 2014