Merge pull request #161 from andymcc/sprint

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

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

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

Merged automatically by jenkins after successful gate test