Fix use of moc executable on Darwin
Merge branch 'rothko' into picasso