[sanlock/f15/master] (4 commits) ...Merge with master.

[Chris Feist]

Summary of changes:

  12dcdb9... Initial import (#675947). (*)
  6ddd7ca... Fix last minute change to CFLAGS (*)
  11fb958... Synced to latest 1.1.0 code (*)
  3f799c6... Merge with master.

(*) This commit already existed in another branch; no separate mail sent