Merge from Jpetazzo master