Merge devel branch, 0.5.3 release