9 Years Ago
compatibility and bugfixes from merge