Atmosphere/atmosphere — pull request #1696 by bzim (2014-08-15 09:18:44+00:00)
Title: fix for Issue #1695 and #1652

Branch based on Tag atmosphere-project-2.2.0, because master was not compileable