Merge from derekbackus/vixen