Regression after updating template.xml from blue_eagle
Merge pull request #1991 from xillibit/k30_bugs12

Regression after updating template.xml from blue_eagle
Merge remote-tracking branch 'upstream/master' into k30_bugs10