commit A and B

Commit B
Merge branch 'test' of https://github.com/alexgibson/bedrock into test