Merge in changes from contest