Sync'd branch releases/aurora with upstream @ Tue Sep  9 11:58:31 PDT 2014