Sync'd branch releases/aurora with upstream @ Fri Nov  7 06:51:43 PST 2014