this should auto merge

for some reason I was behind on commits and didn't notice an error during my pull.  watch carefully, github has been producing odd 405 502 lately.