Merge pull request #472 from mhaskel/acceptance_test_fixes
authorDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 19 Mar 2015 09:16:15 +0000 (10:16 +0100)
committerDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 19 Mar 2015 09:16:15 +0000 (10:16 +0100)
Acceptance test fixes


Trivial merge