Merge branch 'master' into 3138-wiselinks
authorradhika <radhika@curoverse.com>
Fri, 18 Jul 2014 19:50:41 +0000 (15:50 -0400)
committerradhika <radhika@curoverse.com>
Fri, 18 Jul 2014 19:50:41 +0000 (15:50 -0400)

Trivial merge