Changes for compatibility with new version of Vundle