Created by: das-g
Will merge this without review, as it is mostly foreign code being moved around.
Merge details
Merged by: das-g at 2015-10-04 10:35:48 UTC