Sync'd branch releases/beta with upstream @ Mon Oct 20 18:26:33 PDT 2014