Sync'd branch releases/beta with upstream @ Mon Oct 20 09:13:42 PDT 2014