• Merge remote-tracking branch 'refs/remotes/upstream/master' into rust… 

    …up-20140716

Conflicts:
	Makefile.in
    @metajack
    metajack committed Jul 31, 2014
    59b9a67