merge (with conflict fixes) with master (even against rgareus' recommendation)