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

Trivial merge