train-16
Merge branch 'train-16' into train-17

Conflicts:
	npm-shrinkwrap.json
train-17