JOINDIN-466 - resolves warns thrown by Autoloader
Merge remote-tracking branch 'chrishoult/JOINDIN-466' into api-autoloader
Merge a better autoloader format