Sync'd branch releases/aurora with upstream @ Wed Nov 12 13:44:12 PST 2014