Fixed templatetag syntax, upped bugfix version
Merge remote-tracking branch 'gitweb/master'