Re-opened and moved 2.6.1 due to issue where whitespace is removed from beginning of code files.
Should this be closed and included in 2.7.3?
Re-based and ready to merge
Re-opened and moved 2.6.1 due to issue where whitespace is removed from beginning of code files.