am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

* commit '7d7f0f4731b9908117cf157ee3fbf992d9e09c6d':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]