Merge pull request #2250 from apache/fauxton-1.2.1

Update Fauxton to 1.2.1