Merge pull request #207 from jcmurray/master

Fix button enable/disable logic with HCE in 10.3