Sync'd branch releases/aurora with upstream @ Tue Aug 26 06:42:39 PDT 2014