Update template
Merge branch 'hotfix/2014-10-02-fix5'
Merge tag '2014-10-02-fix5' into develop

Fix