Partial merge of @covard's Pull request #70
Partial merge of @covard's Pull request #70

albertdang/Viewpoint,getoutreach/Viewpoint,Tsoondev/Viewpoint,makandra/Viewpoint,Gerd82/Viewpoint,gshutler/Viewpoint,Strauman/Viewpoint,Windermere/Viewpoint,WinRb/Viewpoint,Datacom/Viewpoint,bcherrington/Viewpoint