Sync'd branch releases/aurora with upstream @ Wed Nov  5 07:51:33 PST 2014