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