Merge branch lilydjwg-develop into develop (close #407)