merge from openatv master