Sync'd branch releases/aurora with upstream @ Thu Sep 25 09:28:27 PDT 2014