updates

@brettweavnet this is ready to merge. This bug didn't come up until I tried running jenkins from the master branch.