Sync'd branch releases/aurora with upstream @ Tue Sep  9 14:53:16 PDT 2014