Freshen erlang-rfc4627
Merged bug24803 into stable
Merged stable into default