v1.2014012801, JSON error trap fix.
Merge commit '33cedf61cb48cc949b62dc1afc16fcc68ca08dca'

* commit '33cedf61cb48cc949b62dc1afc16fcc68ca08dca':
  removed files
  .gitignore, excluded p12