NOJIRA : Change to 1.1.x version