Fix some typos

Change-Id: Ic387dac14f664fd01700142ca303d01d2fe09168
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If9e2f5b518a9078488a7df537d306d495da4672a