Merged changed from develop for release 2.0#12
Merged
timlinux merged 15 commits intoAIFDR:masterfrom timlinux:masterSep 23, 2015
+13
Commits
Commits on Sep 23, 2015
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
