Commit 651c53a3 authored by Chris Witterholt's avatar Chris Witterholt
Browse files

Merge branch 'release-1.2.6' into 'master' 

Release 1.2.6

See merge request !165
parents a7de6bec da4936dd