Sync'd branch releases/beta with upstream @ Mon Oct 27 07:40:40 PDT 2014