Merge branch 'master' into 6588-split-manage-account
authorManoj <jonam33@gmail.com>
Wed, 5 Aug 2015 17:42:12 +0000 (13:42 -0400)
committerManoj <jonam33@gmail.com>
Wed, 5 Aug 2015 17:42:12 +0000 (13:42 -0400)

Trivial merge