Refix #396.
Fix #402.
Bump version date.
Merge remote-tracking branch 'upstream/master'