This bothered me :(
Merge branch 'v2.5.x' of github.com:locomotivecms/engine into v2.5.x