BZ_921232

squashed commit version of pull request 23.