# HG changeset patch
# User Chris Cannam
# Date 1477664352 -3600
# Node ID dd49630e0d7070276e33465db43269363df06c18
# Parent  e699bdeef63c387d8466b909ff414d925778d88a# Parent  a83541a1f1003244e058a86a7ba0cde8bc7ed409
Merge from branch project-file-rework