Merge branch 'master' into gl-lines

# Conflicts:
#	src/mol-canvas3d/canvas3d.ts
#	src/mol-plugin/state/objects.ts
#	src/mol-plugin/state/transforms/visuals.ts