Bring master up-to-date

Test out the Continuous Delivery system. Master branch should be left alone after this for the time being.