Sync'd branch releases/beta with upstream @ Wed Oct 22 18:20:36 PDT 2014