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