Merge pull request #2110 from hpohl/7533

What could possibly go wrong
[trivial] size_t/int format specifier mismatch.
Merge pull request #2111 from klickverbot/trivial-fixes

[trivial] size_t/int format specifier mismatch
Merge remote-tracking branch 'upstream/master' into 3096