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