cleanup whitespace
fix up whitespace
cleanup whitespace
move that up there
Merge branch 'extend'
merge base, resolve conflicts
merge master, resolve conflicts