Sync'd branch releases/aurora with upstream @ Fri Sep 26 10:00:29 PDT 2014