Test commit for stephendade's Ubuntu 14.04 compilation fix