Update

Update master -> solonarv bc I can't figure out how to change SmartGit to use the 'solonarv' branch