Merge branch 'plugin-automation'
authorJeremy Carter <Jeremy@JeremyCarter.ca>
Tue, 11 Nov 2014 23:07:44 +0000 (18:07 -0500)
committerJeremy Carter <Jeremy@JeremyCarter.ca>
Tue, 11 Nov 2014 23:07:44 +0000 (18:07 -0500)

Trivial merge