Sync'd branch releases/aurora with upstream @ Wed Nov 12 08:40:58 PST 2014