Merge branch 'master' of github.com:yonicd/details

# Conflicts:
#	tests/README.md