sync with quintusdias master