Revert "merge 2nd"

This reverts commit d4bbb66dd5420f8b828bef1c577d1f8966ea5188, reversing
changes made to 52d3ee883f2020fa8f6aef8f01f36406f0fc3157.
Revert "Revert "merge 2nd""

This reverts commit 912d26c8b7ff7544fd654f7cfac8da3b7b146e0c.
Starting master

23