Merge branch 'master' of github.com:apiman/apiman
Merge branch 'master' of github.com:EricWittmann/apiman