Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

Updated branch

Signed-off-by: snipe <snipe@snipe.net>

Merge pull request grokability#16316 from snipe/v8_final_merge

V8 final merge

Bumped version

Signed-off-by: snipe <snipe@snipe.net>

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

Bumped version

Signed-off-by: snipe <snipe@snipe.net>

Bumped version for master

Signed-off-by: snipe <snipe@snipe.net>