Sync'd branch releases/aurora with upstream @ Tue Aug 26 08:22:30 PDT 2014