merge develop to master

Webmachine users are starting to use Erlang/OTP 17.0, which requires changes to webmachine and its meck dependency. Merge the develop branch to master to ensure all changes necessary for 17.0 are available there.