Merge branch 'affine_fix' into 'master'

patch from bug report #84: encoder bug for affine 6-parameter search

See merge request !102
1 job for master
Status Job ID Name Coverage
  External
pending jenkins