Merge 'master' into 'detsig'

pull/263/head
Jeffrey Walton 2016-09-10 05:03:26 -04:00
commit 84eff488e6
79 changed files with 1302 additions and 1302 deletions