Merge branch 'plugin-automation'
authorJeremy Carter <Jeremy@JeremyCarter.ca>
Wed, 12 Nov 2014 00:36:18 +0000 (19:36 -0500)
committerJeremy Carter <Jeremy@JeremyCarter.ca>
Wed, 12 Nov 2014 00:36:18 +0000 (19:36 -0500)

Trivial merge