Sync'd branch releases/beta with upstream @ Wed Sep  3 08:50:38 PDT 2014