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