New version: 2.6.1

Change-Id: Idcdb504901c16103d7d32778b238b6f522ea53ec