FragHaus/Core3 — pull request #1 by FragHaus (2014-09-28 16:27:48+00:00)
Title: Unstable

Merge changes into master