Merge from aboisvert/pixii