Merge branches 'fixes', 'pgt-next' and 'versatile' into devel