Trailing whitespace and some uninitialized variables.
Merge branch 'master' into filteroptions