Commit 514941adeb1e475b3c929740bd2993a5a69bf9c9

eustas 2016-06-13T16:30:17

Fix implicit 32->64 bit conversion