Explicit class declaration should take precedence over other means

If I override with /* @var $var MyClass */ Then it should be obedied!
Merge branch 'master' into my-develop