<<<<<<< HEAD Mon Jan 15 01:36:14 EST 2018 ======= Tue Nov 14 12:28:03 CST 2017 >>>>>>> 96a8ad2378... FS-10762: [freeswitch-core] Websocket logic error #resolve