Merging master changes into gregdek