7.x 4.x artdept 26

Oops! Looks like I was working off of the 4.x branch instead of the 4.x-art branch. So, does it make sense to merge these, and pull down the changes to the art site?