Pulling in SVN updates
Merge branch 'bw'