Merge branch 'master' into 3138-wiselinks
authorradhika <radhika@curoverse.com>
Tue, 22 Jul 2014 16:00:26 +0000 (12:00 -0400)
committerradhika <radhika@curoverse.com>
Tue, 22 Jul 2014 16:00:26 +0000 (12:00 -0400)

Trivial merge