Sync'd branch releases/aurora with upstream @ Mon Sep  8 08:23:30 PDT 2014