4.x
fix changed libraries in eclipse tutorial
Merge remote-tracking branch 'upstream/3.4' into merge-3.4