Sync'd branch releases/beta with upstream @ Wed Sep  3 13:46:26 PDT 2014