tmp commit
merge
merge
merge
Merge branch '0fox' of github.com:shawn42/foxy into 0fox
merge
fixed gap walking spec