upstream/0.4+20150525git6b9611a
6b9611aa · Fix another compile warning ·