Sync'd branch releases/aurora with upstream @ Tue Sep  9 08:07:34 PDT 2014