Sync'd branch releases/aurora with upstream @ Wed Sep 10 09:47:31 PDT 2014