Unknown local changes
Merge branch 'devel' of github.com:DavePearce/wyclipse into devel