Merge changes from master to Aigrain publishing code - that will be used for new...