Merged changes from 1.2/develop
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	README.md
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	README.md
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' of https://github.com/firesale/firesale into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge remote-tracking branch 'origin/1.2/develop' into 1.3/develop
Merge remote-tracking branch 'origin/1.2/develop' into 1.3/develop

Conflicts:
	firesale/details.php
Moving duplicate code into its own method
This method isn't used. Removing.
Some cleanup
Typehinting build_params
No need for this else condition, default.html will already be set
Swapping the redirect override, so "all" is only ran if a gateway-specific redirect does not exist
Same again