diaspora/diaspora — pull request #4884 by MrZYX (2014-03-30 18:55:23+00:00)
Title: Stabilize cukes II

Another attempt.