Sync'd branch releases/aurora with upstream @ Fri Nov  7 07:33:40 PST 2014