Merge branch '1159-notac-4'
authorBrian Warner <warner@lothar.com>
Sun, 26 Oct 2014 18:56:05 +0000 (11:56 -0700)
committerBrian Warner <warner@lothar.com>
Sun, 26 Oct 2014 18:56:05 +0000 (11:56 -0700)

Trivial merge