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