Merge branch 'wolfgang_20140412_reftest' into mergereftest