Merge github.com:SlimRoms/vendor_slim into jb