1.7.5 + 1.7.8
2.1.4
Minor fixes.
Merge remote-tracking branch 'upstream/master'