Various changes from Upstream#3
Merged
ni-c merged 27 commits intoni-c:masterfrom Oct 13, 2014
Merged
Commits
Commits on Sep 2, 2012
Commits on Dec 11, 2012
Commits on Jan 2, 2013
Commits on Jan 3, 2013
- committed
- committed
- committed
Commits on Jan 4, 2013
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jul 14, 2013
- committedCam Pedersen
Commits on Jul 24, 2013
- committedCam Pedersen
- committedCam Pedersen
Commits on Apr 14, 2014
Commits on Oct 3, 2014
Commits on Oct 4, 2014
- committed