Merge in #30 & #32 for 7.x-1.3 release.