Merging master changes into jade-devel