Merge pull request #93 from xschildw/release-1.21

Release 1.21
Remove Bridge
Try to force ami-2012.03
Merge pull request #94 from xschildw/remove-bridge

Remove Bridge
Merge branch 'release-1.21c' into develop