Merge pull request #56 from apache/PrepareForNextDevIteration

Prepare for next development iteration