Sync'd branch releases/aurora with upstream @ Tue Sep  9 10:03:35 PDT 2014