Sync'd branch releases/aurora with upstream @ Wed Nov 12 14:47:53 PST 2014