sync configs with 3.13 from debian

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>