Done! / #3818

Committed revision 258. Happy branching!