phonegap 3.5.0-0.21.17 -> 3.5.0-0.21.18
Merge branch '3.5.0'