Merge branch 'master' into develop

bump version to 0.12.1next

Conflicts:
	version
	version.m4

diff --cc version
index 2c493c8,34a8361..3af5256
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.12next
 -0.12.1
++0.12.1next

diff --cc version.m4
index a7e35d5,d034798..93e5146
--- 1/version.m4
--- 2/version.m4
+++ b/version.m4
@@@ -1,1 -1,1 +1,1 @@@
- m4_define([devflow_version], [0.12next])
 -m4_define([devflow_version], [0.12.1])
++m4_define([devflow_version], [0.12.1next])