One five forking

Version updates to trunk