Merge branch 'extract_fa'
authorClifford Wolf <clifford@clifford.at>
Fri, 25 Aug 2017 11:42:13 +0000 (13:42 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 25 Aug 2017 11:42:13 +0000 (13:42 +0200)

Trivial merge