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