Fixed issue #215.
Merge branch 'next' of https://github.com/blackberry/VSPlugin into next