attempting to synchronize vip svn and git master
Merge pull request #186 from nschoenholtz/sync-with-vip

Attempting to synchronize VIP SVN and Git master