Merge develop in to master

@alexwolfe I'd like to merge in the changes from [develop] as we've had these for a while now and they should get synced up. Making a pull request so you can get a chance to point FB at the sha1 or a tag you prefer first.