Merge remote-tracking branch 'upstream/master' into 0.3.4

Conflicts:
	lib/fixtures/laws20131205.json
	lib/translations/lib/es.json