Sync'd branch releases/aurora with upstream @ Tue Sep  2 12:43:23 PDT 2014