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