Backport some 2552212 changeset to 2.0

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0' into 2.1

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	src/views/api/index.blade.php