latent push of things i've been working on lately
Merge remote-tracking branch 'origin/master'