Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branches 'upstream/master' and 'origin/master'
Merge remote-tracking branches 'upstream/master' and 'origin/master'
Merge remote-tracking branch 'upstream/master'
New upstream release

 * Rebuilt from current git
 * Moved to proper git versioned hash
Merge pull request #98 from zeridon/packaging

Slight Packaging rework