fixed trivial issues with Optional unwrapping and Boolean usage of Optionals
fixed another trivial Boolean usage of Optional problem
fix for URL.port Optional boolean usage
moved recursive functions to class (enum) level as workaround for 11266246 introduced with XCode 6 Beta 6
fixed parameter naming error
Merge branch 'feature/beta6-compatibility' into develop