Trying to fix tests on AppHarbor
Merge branch 'Development' into Production