Merge "Enable plugin for GCC 4.6"