Final whitespace snafoo fixed.
Merge branch 'develop' into gh-pages