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