[erlang-cl/f21] (2 commits) ...Merge branch 'master' into f21