Sync'd branch releases/aurora with upstream @ Sat Aug 30 14:55:30 PDT 2014