1.1.7
1.1.8
Merge commit '4cc1dfd82f0216c2025a7da6d28e6e9cebafb02c'

Conflicts:
	package.json