Prepare for next development version

Change-Id: I597922467bf2ade7f6e10352973da192df4fcc06