Fix compatibility issues with API 131 (AppCode, intellij 13.0 ...) #4