Sync'd branch releases/aurora with upstream @ Wed Sep 10 00:43:33 PDT 2014