Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 14:19:02 +0000 (16:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 14:19:02 +0000 (16:19 +0200)
commit9a5b1d7fbb39cb340536eb41596404c3e0fe2ccf
treec1b605a01db6d10c26bf2cfd01be4b8b5c23d41a
parent35200c5405dd11ac49f0d511065c312389d6c46e
parent32bb805deb7339918986a6305b769939b005e830
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I5ce2fc73aa2b5b3d1c7e2108105c32cb810cd6bf