Merge "Update Wahoo SVN to 31" into qt-dev
am: ec6c1b56de

Change-Id: I07dd69f4df32827cfcf53ca7b65986328aec9824