AUI-1201

Hey Nate,

This is just a backport of https://github.com/liferay/alloy-ui/compare/bc51a0bcf2da01b81ea93d73470623da9275039e...598f6f8a3e0e891d06b6ffd84b627d391f59c356