Syncing Akeeba Strapper
Merge remote-tracking branch 'origin/fof3-wip' into fof3-wip

Conflicts:
	strapper/akeeba_strapper/strapper.php