More comprehensible eyes (closes #335)
Merge branch 'master' into feature/335/more-comprehensive-hide-actions
Fix merge conflict
Merge pull request #338 from ZeusWPI/feature/335/more-comprehensive-hide-actions

More comprehensible eyes (closes #335)