0.10.4 -> 0.10.6
Merge remote-tracking branch 'upstream/master'