Merge remote-tracking branch 'google/release' into develop
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 20 Mar 2014 20:29:11 +0000 (20:29 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 20 Mar 2014 20:29:11 +0000 (20:29 +0000)

Trivial merge