Merge commit 'a3c6b7f8b09dc8d96f6e6ab66c3502286f06ac00'

* commit 'a3c6b7f8b09dc8d96f6e6ab66c3502286f06ac00':
  5

Conflicts:
	LICENSE