Merge 269e34c4c7342c71f179fd9995d83ec84e119877 into 1ae84e2dec9b9aeb2c769b147d070994d4315d0b
Bumping version