fix #676
Merge remote-tracking branch 'devel/676_anim_cmap'