Merge branch 'master' into 6640-all-projects-dup
authorManoj <jonam33@gmail.com>
Fri, 21 Aug 2015 14:57:08 +0000 (10:57 -0400)
committerManoj <jonam33@gmail.com>
Fri, 21 Aug 2015 14:57:08 +0000 (10:57 -0400)

Trivial merge