Merge branch 'master' into 2525-java-sdk
authorradhika <radhika@curoverse.com>
Sun, 4 May 2014 21:35:00 +0000 (17:35 -0400)
committerradhika <radhika@curoverse.com>
Sun, 4 May 2014 21:35:00 +0000 (17:35 -0400)

Trivial merge