Sync'd branch releases/aurora with upstream @ Thu Oct 30 12:56:37 PDT 2014