Avoid warnings on Erlang/OTP 17.
Merge branch 'erlang-18'