Commit 0a1999dfd2357dc0aefec1b602e1a16fb2f25aa0

Philipp Wiesemann 2016-01-16T21:25:10

Fixed compile warnings about type conversion. Found by buildbot.