Merge branch 'master' into 'issue#61'

# Conflicts:
#   go/go/templates/link_box.html
1 job for master in 3 minutes and 33 seconds (queued for 2 seconds)