Fixed merge fail.
Merge pull request #439 from ambiata/topic/de-derp

Fixed merge fail.