Code style changes from Ventero feedback.
Merge branch 'master' into feature-appstart