AUI-1055 Source Formatting
Merge pull request #759 from brunocoelho/AUI-1055

AUI-1055 Source Formatting