Changes since tag 7.1.5

commit 9efc91ea501b703151900c65122ae4dca51941c2
Author: Josh Worden <solocommand@gmail.com>
Date:   Wed Feb 1 20:18:19 2017 -0600

    Revert bad notaint change
    
    This partially reverts commit c80f8258cfcefc6c5d777ecbe260e745466106d1.

