rebases ...
conflict fix.
conflict fix.
bugfix.
Revert "bugfix."

This reverts commit ab0220688afcfc93645b3134c49c8d075a58856a.
Revert "conflict fix."

This reverts commit 33c4dc1412b4657d73b2d40944a631380aca3bc1.
Merge remote-tracking branch 'origin/master'