Merge remote-tracking branch 'origin/master' into release-candidate

# Conflicts:
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-lib/rocketchat.info
#	tests/end-to-end/api/01-users.js