Branch 439

This contains code which fixes VIM-439 and VIM 528

It is recommended to first pull VIM-528