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