New release
Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  New release

Conflicts:
	Makefile