Merge from Emdek/master