Merge remote-tracking branch 'google/develop' into release
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Sun, 30 Mar 2014 13:46:28 +0000 (14:46 +0100)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Sun, 30 Mar 2014 13:46:28 +0000 (14:46 +0100)

Trivial merge