Merge changes from robotlegs org fork