Fix reversed PIN_COUNT strategies (thanks to txoof for implementation and bugfix)
Merge remote-tracking branch 'upstream/master'