Update from upstream 2014-07-05

c5d95af4d08ad9f47fc7f13a8137e5656c4f6ba5
Update from upstream 2014-07-06

844ea239255c5e95254ce605d4146e8fdc20da47
Update from upstream 2014-07-08

3ec1afd75074b61858a90506b51de1baf100a9fe
Update from upstream 2014-07-08

3f9598b8f62930c756f5ae9e3021b352e11445e9
Update from upstream 2014-07-08

394bf291bfa3881bb9827b9fc7b7d1112d83f313
v0.1.1