Merge branch 'ejoubaud-master'
0.2.16
Revert "Add support for laika.opts file"

This reverts commit fad2e286cc1b88e13b4cb2811b935128e7e8401c.
0.2.17
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/laika