merge upstream changes#1
Merged
nchammas merged 76 commits intonchammas:masterfrom Sep 16, 2014
Merged
Commits
Commits on Sep 8, 2014
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted

- authored andcommitted
- authored andcommitted
- committed
- authored andcommitted

Commits on Sep 9, 2014
- committed
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted

Commits on Sep 10, 2014
- authored andcommitted
- authored andcommitted

- authored andcommitted

- authored andcommitted

- authored andcommitted
- authored andcommitted
- committed
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted

Commits on Sep 11, 2014
- committed
- committed
- authored andcommitted
- authored andcommitted

- authored andcommitted
- authored andcommitted
- authored andcommitted
Commits on Sep 12, 2014
- committed
- authored andcommitted
- authored andcommitted

- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted
- committed
- authored andcommitted
- authored andcommitted
- authored andcommitted

Commits on Sep 13, 2014
- committed
- authored andcommitted
- authored andcommitted
- authored andcommitted
- committed
- authored andcommitted
- authored andcommitted
- committed
- authored andcommitted
- authored andcommitted
- authored andcommitted
- committed
- authored andcommitted
Commits on Sep 14, 2014
- authored andcommitted
Commits on Sep 15, 2014
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted

- authored andcommitted
- authored andcommitted
Commits on Sep 16, 2014
- authored andcommitted
- authored andcommitted
- authored andcommitted

- authored andcommitted