Merge pull request #1090 from tuxmea/fix_pin_template