-merged with master
-merged with master

TestingWithFrank/Frank,pskrz/Frank,Weeman360/frank-cucumber-pitchin,quamotion/Frank,soundcloud/Frank,quamotion/Frank,Weeman360/frank-cucumber-pitchin,Weeman360/frank-cucumber-pitchin,pskrz/Frank,moredip/Frank,soundcloud/Frank,quamotion/Frank,TestingWithFrank/Frank,TestingWithFrank/Frank,pskrz/Frank,Weeman360/frank-cucumber-pitchin,moredip/Frank,soundcloud/Frank