Merge remote-tracking branch 'origin/master-1.3.x'

Conflicts:
	core/html_api.php
	login_page.php
	lost_pwd.php
	lost_pwd_page.php
	signup.php
	signup_page.php
	verify.php

core/filter_api.php

@@ -1052,7 +1052,7 @@ function filter_unique_query_clauses( array $p_query_clauses ) {
  * should be used manually when required.
  * This is the case when "filter_get_bug_count" is used followed by "filter_get_bug_rows_result"
  * @param array $p_query_clauses Array of query clauses.
- * @param type $p_pop_param      Whether to pop DB params from the stack
+ * @param boolean $p_pop_param      Whether to pop DB params from the stack
  * @return integer
  */
 function filter_get_bug_count( array $p_query_clauses, $p_pop_param = true ) {
@@ -1187,7 +1187,7 @@ function filter_get_bug_rows_filter( $p_project_id = null, $p_user_id = null ) {
  *                                 -1 or null indicates default query (no limits)
  * @param integer $p_offset        Offset query results for paging (number of rows)
  *                                 -1 or null indicates default query (no offset)
- * @param type $p_pop_param        Whether to pop DB params from the stack
+ * @param boolean $p_pop_param        Whether to pop DB params from the stack
  * @return IteratorAggregate|boolean adodb result set or false if the query failed.
  */
 function filter_get_bug_rows_result( array $p_query_clauses, $p_count = null, $p_offset = null, $p_pop_param = true ) {