BZ#979247 Version allows spaces, when it shouldn't.
BZ#978673 Added the ability to specify the brand logo.