Merge branch '2.x' into 2.1.x

CONTRIBUTING.rst

@@ -286,15 +286,25 @@ Release process
 
      git-buildpackage
      dpkg -i ../monkeysign_*.deb
+     monkeysign
+     monkeyscan
+
+7. build and test Python "wheel"::
+
+     dpkg --remove monkeysign
+     python setup.py bdist_wheel
+     pip install dist/*.whl
+     monkeysign
+     monkeyscan
+     pip uninstall monkeysign
 
 7. push commits and tags to the git repository::
 
      git push
      git push --tags
 
-8. publish on PyPI::
+8. publish Python "wheel" on PyPI::
 
-     python setup.py bdist_wheel
      twine upload dist/*
 
 9. upload Debian package::
@@ -304,5 +314,8 @@ Release process
 10. add announcement on website and mailing list:
     monkeysphere@lists.riseup.net
 
-11. on 0xACAB: close milestone, open the next one, edit tag's release
-    notes
+11. on 0xACAB: close the current `milestone`_, create the next one and
+    edit the `release notes on the tag`_
+
+.. _milestone: https://0xacab.org/monkeysphere/monkeysign/milestones
+.. _release notes on the tag: https://0xacab.org/monkeysphere/monkeysign/tags