Merge branch 'hotfix/2014.04.11.3'
Job variables in templates
Merge branch 'hotfix/2014.04.11.4' into develop