Revert "Merge branch 'TestBranch'"

This reverts commit 2f780dca7ff44b2e995d0811a755333bcc15a707, reversing
changes made to 26196e39541babcd206078d8f4b6c67a88e97219.
Revert "Revert "Merge branch 'TestBranch'""

This reverts commit aefd4010a20dcb15a84c513f2172f606a1af0d78.
Fixing the great merge disaster of 2013