Fixing git unit test again.
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #106 from mxia/development

Fixing the git unit test.