Merge pull request #136 from andymcc/sprint

Merged automatically by jenkins after successful gate test
Merge pull request #137 from andymcc/sprint

Merged automatically by jenkins after successful gate test