Fixed error with compilation
Pulled in plugins/ from master