Weston 1.6

Change-Id: Id718f58011a043c73aee838257b41e176be2721d