merge apitronics:master to rjsteinert:master