Merge branch 'binder' into dev

# Conflicts:
#	README.md