Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4