Update to 1.1

Change-Id: Iab806693d2ee940c29b5d0dcc08a7b1e88bcd97f
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Merge remote-tracking branch 'upstream/stable' into hawaii-stable