Sync'd branch releases/beta with upstream @ Mon Oct 27 14:50:37 PDT 2014