Sync'd branch releases/beta with upstream @ Wed Oct 29 17:44:30 PDT 2014