Sync'd branch releases/aurora with upstream @ Mon Sep 22 08:46:38 PDT 2014