grnet/kamaki — pull request #51 by saxtouri (2014-08-25 11:05:21+00:00)
Title: Cherry-pick bug fixes from release-0.13

Suggested reviewer: @iliastsi