Sync'd branch releases/aurora with upstream @ Wed Sep  3 13:47:25 PDT 2014