Forward ports jbrien/spree_landlord#19 to master

Original pull request is at https://github.com/jbrien/spree_landlord/pull/19