add missing include directive
Merge branch 'master' into classes