Testing merge on github osx client

Let's see how this goes..
Merge branch 'TestingGHClient'