Merge remote-tracking branch 'origin/unistrutfallprotection' into afcweb