Merge locomotive master for fix

Merge up to https://github.com/locomotivecms/engine/commit/f8a776bc28a482ce49d57ba4b9d4289a469f24ac from locomotivecms/engine