Merge branch 'master' into 6588-split-manage-account
authorManoj <jonam33@gmail.com>
Wed, 29 Jul 2015 18:13:55 +0000 (14:13 -0400)
committerManoj <jonam33@gmail.com>
Wed, 29 Jul 2015 18:13:55 +0000 (14:13 -0400)

Trivial merge