• Merge remote-tracking branch 'origin/master'

    andreapaiola
    andreapaiola committed May 20, 2017
    Loading status checks…
     
    Conflicts:
	docs/faq.md
    0b71b0b