preferences editor completion complete
Merge pull request #1632 from diegosarmentero/master

preferences editor completion complete