Version bump to 4.15.1
Fixing merge conflicts
Version bump to 4.15.2