Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
don't fail if old_path is None
Check if query is defined in old_path, since it might be None (e.g.
from a navigation_tree_query)
Merge remote-tracking branch 'upstream/master'
Merge pull request #34 from pysailor/master

In the catalog patch, guard against None values for old_path