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