andreapaiola
Merge remote-tracking branch 'origin/master'
Loading status checks…
0b71b0b 
Conflicts:
	docs/faq.md