Migrated to clang 3.5