Sync'd branch releases/aurora with upstream @ Wed Nov 12 10:09:52 PST 2014