merge from lp:~chris-thomas/openpetraorg/dev_20141127_Finance_GiftGLTesting11
https://tracker.openpetra.org/view.php?id=3657
https://tracker.openpetra.org/view.php?id=3658