https://github.com/OCHA-DAP/DAP-System/issues/256
Merge pull request #272 from OCHA-DAP/bugfix-bundle-2014-08

Pull request for: https://github.com/OCHA-DAP/DAP-System/issues/256