Merged upstream devel into this branch

.. and ran 'make tests'