very minor
fix #1026
fix #1026
very minor
fix after merge
Merge branch 'master' into usesite

Conflicts:
	src/com/redhat/ceylon/compiler/typechecker/analyzer/ExpressionVisitor.java