Merge branch 'master' into 2525-java-sdk
authorradhika <radhika@radhika>
Wed, 30 Apr 2014 10:53:13 +0000 (06:53 -0400)
committerradhika <radhika@radhika>
Wed, 30 Apr 2014 10:53:13 +0000 (06:53 -0400)

Trivial merge