Eclipse Plugin
Merge commit '5e11c89cb81f029856d8473a0e968cb59ff7e3c5'