Revert "Merge remote-tracking branch 'crowding/master' into develop"

This reverts commit 1f9e65e9de3dc8297e90ef7fde320d651a983840, reversing
changes made to f2700e01ae3ef7b449a894ac52f781fcbec44501.

Conflicts:
	NEWS