Sync'd branch releases/aurora with upstream @ Tue Nov 11 07:43:02 PST 2014