Squashed 'noob3d/' changes from 02f31b9..36987ca

36987ca small edit regarding naming semantics of functors

git-subtree-dir: noob3d
git-subtree-split: 36987ca87c5a254f7096bf24bef482005784b981
Merge commit '1889f18b62784d703d1c5e3cba26d47cda5faf18'