added missing lib
removed '=' from comments so we can identify errors in buildbot easier
Merge remote-tracking branch 'upstream/master'