Merge branch 'master' into dev

Conflicts:
	plugin.xml
This commit is contained in:
Andrew Grieve 2014-02-27 16:03:32 -05:00
commit 2a7520112e

Diff Content Not Available