Merged back wireload:master changes into fork