Merge branch 'master' into 3889-functional-testing
authorradhika <radhika@curoverse.com>
Wed, 24 Sep 2014 17:24:30 +0000 (13:24 -0400)
committerradhika <radhika@curoverse.com>
Wed, 24 Sep 2014 17:24:30 +0000 (13:24 -0400)

Trivial merge