wisp
 
(Arne Babenhauserheide)
2014-02-09: merge stable into default.

merge stable into default.