Merge plcrashreporter 1.2.1