Sync'd branch releases/aurora with upstream @ Thu Nov 13 12:01:58 PST 2014