Fix endianness detection in msgpack-python
Update salt-master spk
Merge remote-tracking branch 'upstream/develop' into develop

"

This reverts commit 878b494b940bbeeb4355f5df6b222d676282a624.

Conflicts:
	cross/shellinabox/patches/vt100.patch
	spk/shellinabox/Makefile
Add shellinabox switch to disable SSL menu
Fix shellinabox invisible on-screen keyboard button