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

Trivial merge