Sync'd branch releases/beta with upstream @ Mon Oct 20 10:03:37 PDT 2014