1.1.3-2014.03.20
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	java/Equivalence.java