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