Sync'd branch releases/beta with upstream @ Mon Oct 27 16:00:39 PDT 2014