API-API stage 1
Fixed compile error
OK, sorry... I just did that because KnownUnown wants me to do so.
Merge branch 'master'