Wrap Option -MultiViews in IfModule.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Multiple docblock typo fixes.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Merge branch '2.0'