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