1.0.4 stable
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  1.0.4 stable