Faq branch

https://github.com/Shippable/pm/issues/1579