Merged changes from http://wp.lo/ on 06.10.2014

	Conflict: asa-si-asa.txt [added]