Sync'd branch releases/beta with upstream @ Wed Oct 29 15:24:59 PDT 2014