Merge branch 'master' into 2525-java-sdk
authorradhika <radhika@curoverse.com>
Tue, 27 May 2014 14:47:17 +0000 (10:47 -0400)
committerradhika <radhika@curoverse.com>
Tue, 27 May 2014 14:47:17 +0000 (10:47 -0400)

Trivial merge