Merge remote-tracking branch 'origin/Sam'
Merge branch 'master' of https://github.com/cblaine/StrykerEIP