Merge remote-tracking branch 'google/master' into develop
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Mon, 7 Apr 2014 16:09:39 +0000 (17:09 +0100)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Mon, 7 Apr 2014 16:09:39 +0000 (17:09 +0100)

Trivial merge