Merge pull request #60 from yggie/ide-update-prep

Merging this despite @yggie being so hostile. ;-)
Merge remote-tracking branch 'upstream/develop' into ide-reborn

* upstream/develop:
ping to Jon