1.3.1 is a bugfix release from the stable/icehouse branch. Change-Id: I1ec24b0aaccb67e4f3043d481cec13d82dec3c0d