Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/bccie/doexport.php
	modules/bccie/parser.php
Merge branch 'master' of github.com:Open-Wide/bccie