forgot patch on root
Merge branch 'develop' of github.com:LBNE/lbne-build into larsoft-build