Sync'd branch releases/beta with upstream @ Mon Oct 13 18:04:35 PDT 2014