FIX HTML5 parser not tracking context correctly
FIX Make ShortcodeParser#parse passthrough not error on invalid HTML
FIX ShortcodeParser#parse in < PHP 5.3.6 where saveHTML doesnt take arg
Merge pull request #1213 from silverstripe-rebelalliance/feature/shortcodes

FIX issues with new shortcode parser
FIX ShortcodeParser producing bad output after escaped tag

Also tightens up matching of shortcodes so we dont match on invalid shortcodes
FIX Make ShortcodeParser obey error_behavior in attribute scope
ENHANCEMENT: updated the reference index on doc.silverstripe.com 3.0 - There were lots of broken and missing links
BUG: Correct semantic error regarding cURL options in RestfulService

cURL options are numeric, and array_merge is destructive of numeric
keys. Replace array_merge calls with array union operator, with defaults
on right-hand side so that passed options override defaults.
BUG: Fetch curl_error in RestfulService

$curlError was used only once and never defined. Replace $curlError with
a call to curl_error($ch).
Merge pull request #1224 from silverstripe-rebelalliance/feature/shortcodes

Two more small fixes for new Shortcode Parser
Merge pull request #1231 from oddnoc/3.1-restfulservice-option-merge-fix

BUG: Correct semantic error regarding cURL options in RestfulService
Merge pull request #1230 from oddnoc/3.1-restfulservice-error-check

BUG: Fetch curl_error in RestfulService
Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex

Conflicts:
	docs/en/reference/index.md
FIX: Ensure that Director::test() doesn't return a string
Check for object type before calling method, prevent fatal error in failing test.
Fixed invalid classname in test