merge foosel:devel in to CraigRK:devel