cegli/dolphin — pull request #18 by CarlKenner (2014-12-19 07:34:59+00:00)
Title: Another difficult merge done.

Merge this.