Merge remote-tracking branch 'devel/issue_555_boxfill_not_shown_properly'
Added option for antialiasing
Merge branch 'multisampling' into devel