grnet/kamaki — pull request #48 by saxtouri (2014-08-01 13:18:56+00:00)
Title: Sync develop with release

Suggested reviewer: @illiatsi