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