Merge remote-tracking branch 'remotes/zpuskas/kicad-4.0.2'