Proposal for inline documentation
behat.yml
merge
Merge branch 'trainmaster' into develop