Merge branch 'master' into ext-mic

diff --cc moonshot/mech_eap/accept_sec_context.c
Simple merge

diff --cc moonshot/mech_eap/gssapiP_eap.h
Simple merge

diff --cc moonshot/mech_eap/init_sec_context.c
Simple merge

diff --cc moonshot/mech_eap/util.h
Simple merge

diff --cc moonshot/mech_eap/util_context.c
Simple merge