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