am 56ee04e1: Merge "Adding some missing files." into jb-dev

* commit '56ee04e1208b00ee24f753a5cbe09fcef2facf12':
  Adding some missing files.