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