Test commit one
Third commit
Test commit two
Merge feature 'test-one' into develop
Merge release '2014-02-11' into master