Swapped master with 4.1 branch, removed 4.1 branch
might work on 4.2.014 client later