Rebase against Ubuntu-3.13.0-32.57 release tag

Refs #21