Allow splicing optional object field with spliced name
Merge branch 'master' into scala-2.11
Remove dependency on scala parser combinators