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