Merge remote-tracking branch 'origin/master' into idea12

Conflicts:
	compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
	update_dependencies.xml