Merge remote-tracking branch 'iferminm/decluttering-exception-handling' into development
Merge remote-tracking branch 'origin/development' into development
Trying to fix the issues with the spaces that Travis is reporting
Merge remote-tracking branch 'origin/development' into development