Fixed merge screwup
Merge branch 'feature' into develop