Fix typo in templates documentation
Merge remote-tracking branch 'origin/3.0' into 3.1
Updated github path