Norm agilen manual fix.
Merge branch 'master' of https://github.com/chipster/chipster-test.git