Removing a few blank lines (trivial)
Merge branch 'master' into testing