Merge branch 'jrugged' into pu