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