opf/openproject — pull request #2288 by ulferts (2014-12-03 08:46:54+00:00)
Title: Fix/merge release 4 0 into dev

Because of the conflicts I had to resolve, I want to run this through travis before merging.