Merge pull request #1031 from aaron-edwards/master

Fix for failing unit tests in ViewClientController