The following changes were made to the upstream source:

  * Removed examples/tools/ and examples/gui/bottle/media/
    (not present in previous version anyway)
    from source, because there are different licenses involved.
    Needs clarification.
