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