Merge pull request #1342 from bradymiller/finish-up-fancybox-removal_1