Merge remote-tracking branch 'origin/master' into Issue1824
Merge pull request #1825 from TEAMMATES/Issue1824

Remering floating head