Rebase PR 63

Rebased https://github.com/redhat-openstack/astapor/pull/63 from jistr.