5,madigan6: merging from madigan6 to master continued p2
Merge branch 'master' into meyer30