Sync'd branch releases/aurora with upstream @ Wed Sep 17 09:29:30 PDT 2014