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