Sync'd branch releases/aurora with upstream @ Wed Sep 10 12:16:28 PDT 2014