Merge branch 'denny' into HEAD
merge fixed
Merge branch 'merge_fix' into marc
blue velvet