Merge with upstream and fixing build#8
Merged
joestein merged 45 commits intoelodina:masterfrom crobox:masterNov 18, 2015
+2,214-345
Commits
Commits on Aug 7, 2015
Commits on Aug 30, 2015
Commits on Sep 4, 2015
- committed
Commits on Sep 20, 2015
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 23, 2015
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 24, 2015
- committed
- committed
- committed
- committed
- committed
Commits on Sep 25, 2015
- committed
- committed
- committed
