Merge remote-tracking branch 'google/master' into develop
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 1 May 2014 18:49:53 +0000 (19:49 +0100)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 1 May 2014 18:49:53 +0000 (19:49 +0100)

Trivial merge