fix for pagination error when attempting to deploy and add assets
Merge remote-tracking branch 'upstream/master'

Changes from remote after pagination fix
Merge pull request #40 from splinter/master

fix for pagination error when attempting to deploy and add assets