Sync'd branch releases/beta with upstream @ Mon Oct 20 12:04:34 PDT 2014