Various;

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Merge branch 'refs/heads/1.2'