Merge origin/master

Conflicts:
	firera.js