Sync'd branch releases/aurora with upstream @ Wed Sep  3 14:37:39 PDT 2014