Sync'd branch releases/aurora with upstream @ Mon Oct  6 11:11:34 PDT 2014