feedback template
minors
Merge remote-tracking branch 'hellman/master'