Sync'd branch releases/aurora with upstream @ Tue Nov  4 07:39:42 PST 2014