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

* commit '9b1ac26921b9c7aaf3c43c8094d81cfabc5cc085':
  Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]