am 83d5eb7a: Merge "Fix project setup." into idea133  Auto-merge: 28678c4

* commit '83d5eb7a3413f7f6d113af9dedd0482f6e43a7cb':
  Fix project setup.