Sync'd branch releases/aurora with upstream @ Tue Sep  9 12:19:56 PDT 2014