Cherry Pick from Canuck, mainly GPU and governor Feb 9 2013 commit